From 3f4cc9b6c836ea48f966aad5c9aac12e31dc9f80 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Dec 2005 14:00:26 +0000 Subject: [PATCH] Fix a C99ism, spotted by Crispin Flowerday. 2005-12-07 Matthias Clasen * gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism, spotted by Crispin Flowerday. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkfilesystemunix.c | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index da1cae6077..fe7198919f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-07 Matthias Clasen + + * gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism, + spotted by Crispin Flowerday. + 2005-12-06 Behdad Esfahbod * gtk/gtksettings.c (settings_update_font_options): Turn metrics diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index da1cae6077..fe7198919f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-12-07 Matthias Clasen + + * gtk/gtkfilesystemunix.c (cb_fill_in_mime_type): Fix a C99ism, + spotted by Crispin Flowerday. + 2005-12-06 Behdad Esfahbod * gtk/gtksettings.c (settings_update_font_options): Turn metrics diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index ccc541a3a2..5f078190dd 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -2154,15 +2154,16 @@ cb_fill_in_mime_type (gpointer key, gpointer value, gpointer user_data) GtkFileFolderUnix *folder_unix = user_data; char *fullname = g_build_filename (folder_unix->filename, basename, NULL); struct stat *statbuf = NULL; + const char *mime_type; if (folder_unix->have_stat) statbuf = &entry->statbuf; - const char *mime_type = xdg_mime_get_mime_type_for_file (fullname, statbuf); + mime_type = xdg_mime_get_mime_type_for_file (fullname, statbuf); entry->mime_type = g_strdup (mime_type); g_free (fullname); - /* FIXME: free on NULL? */ + return FALSE; } -- 2.30.2